From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Fri, 12 Jul 2019 12:00:55 +0000 (+0200)
Subject: workspace: Don't use clones' delegate to check children
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~811^2^2~162
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=24d3744cb98aa5b828edfc007994bfe0912df245;p=gnome-shell.git

workspace: Don't use clones' delegate to check children

The WindowClones are now themselves actors, so we can just check for
their type instead of checking for the delegate.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/700
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 5459b8baf..9a8c0d94d 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -83,8 +83,8 @@ class WindowCloneLayout extends Clutter.LayoutManager {
     vfunc_allocate(container, box, flags) {
         container.get_children().forEach(child => {
             let realWindow;
-            if (child == container._delegate._windowClone)
-                realWindow = container._delegate.realWindow;
+            if (child == container._windowClone)
+                realWindow = container.realWindow;
             else
                 realWindow = child.source;
 
@@ -1099,10 +1099,8 @@ const WorkspaceActor = GObject.registerClass(
 class WorkspaceActor extends St.Widget {
     vfunc_get_focus_chain() {
         return this.get_children().filter(c => c.visible).sort((a, b) => {
-            let cloneA = (a._delegate && a._delegate instanceof WindowClone) ? a._delegate : null;
-            let cloneB = (b._delegate && b._delegate instanceof WindowClone) ? b._delegate : null;
-            if (cloneA && cloneB)
-                return cloneA.slotId - cloneB.slotId;
+            if (a instanceof WindowClone && b instanceof WindowClone)
+                return a.slotId - b.slotId;
 
             return 0;
         });